Style changes, and move JS to separate file