Simplify some HTML and CSS