Revert "UI changes, round 2"

This reverts commit c07cad51e23f44d8599bdf8a51a304bcbd042dc4.