changed the layout again for more structure