Finishing up rewrite of html and css