UI overhaul

UI Overhaul Merge