Layout now using main css file

No more nested css in the layout.