UI Overhaul Nearly Complete