Lots of visual/js tweaks from new design comp