Finish UI overhaul
Fix merge conflicts