Merging Adam's CSS and Javascript overhaul