updated a bit of the layout

Still needs a lot more work