UI cleanup and enhancements