Massive UI reshuffle, cleanup, updates