Refactoring HTML and CSS in the main application structure