Yet another round of UI improvements
Various UI pending work