Changed layout again; navbar on top now