Rework of HTML and CSS to be more semantic/clean