Start reworking CSS and HTML