Minor refactor of html, css