More restructuring, moved .container element to individual views
More restructuring
Header adjustments