Refactor CSS and semantify HTML