Concentrate Layout file
- moving higlevel container styles into container fold and out of layout file
- moving shims to helpers