ui fixes and enhancements