Move css and js into separate files
Rearrange JavaScript some