Clean up templates + CSS

Fixed HTML errors
More consistency in CSS names