Lots of style changes and JS work