Merge UI Overhaul