CSS formatting
Refactor markup and CSS a bit