UI tweaks and js cleanup