Fixed more of the HTML/CSS