Completely redesigned UI with better heuristics