Minor refactoring of HTML & CSS