Overhaul of UI + Graph