major overhaul to UI