Moved all javascript into one file