Pull js and css out into separate files, some other cleanup