Further relevant UI cleanups