Lots of visual/js tweaks from new design comp
Merge js_interactivity_for_new_design