Tidy up js and css