- Lots more css and markup refactoring