Styling, more restructuring, HAML-izing