UI rehaul take two