Couple improvements to UI