General clean up and extracted js and css to their own files