Rework of layout

Still got to think of home page layout