Initial overhaul of styles including refactoring of CSS