Building new layout. Addapted upper section.