Reworked first level layout