Lots of js tweaks, sag and styling