Latest UI work and rework of some of the JS