Aesthetics: CSS and light code refactoring