Corrected and cleaned up js and css