Josh: Major changes and css tweaks, lots of added stuff