UI touch up tweaks

UI changes to support efforts