Visitors are expected to flock to the National Museum of Flight as it fully reopens following a £3.6 million redevelopment of two Second World War hangars at the site.

A Spitfire and Messerschmitt will be among the 30 aircraft going on display at the East Fortune site in East Lothian.

One hangar is dedicated to military aircraft while the other houses commercial and leisure planes.

The doors are being flung open to visitors on Friday, in time for the start of the Easter weekend.

Dr Gordon Rintoul, director of National Museums Scotland (NMS), said: "Spanning a century of aviation, the displays present our spectacular aircraft in new and dynamic ways, revealing for the first time the engaging stories of some of the people who flew and worked with them."

Highlights of the military hangar include a Supermarine Spitfire; a rocket-powered Messerschmitt Me 163B-1a Komet, which was the fastest aircraft of the Second World War; the oldest surviving Hawker Siddeley Harrier jump jet and an English Electric Lightning - the RAF's first supersonic jet fighter.

For the first time, uniforms, documents, photographs and weapons will be displayed alongside the aircraft.

The other hangar will display aircraft ranging from hang gliders and microlights to a Scottish Aviation Twin Pioneer and a Druine Turbulent light aircraft built in a Scottish home in the 1960s.

The hangars were constructed in 1940/41 and were originally designed to last just a few years.

As part of the East Fortune Airfield Scheduled Ancient Monument, they have been restored, insulated and heated for the first time.

While the revamp was being carried out, the museum was only open on Saturdays and Sundays.

Funding for the facelift included a £1.3 million grant from the Heritage Lottery Fund and £1.8 million from the Scottish Government.

Lucy Casot, head of the Heritage Lottery Fund in Scotland, said: "Open the door of these two WW2 hangers and you are opening the door to history.

"The stories of incredible flying machines come to life in a way which will inspire, teach and let imaginations fly."