HTML refactoring
First part of CSS refactoring
Completed refactoring CSS