Fixing up html, js and css