More UI work and enhancements