Merge UI Enhancements