Added a bunch of fixes into html and css