Major UI Improvements and Enhancements