Better UI
This reverts commit 4768488653, reversing changes made to 8c6d0134a8.
4768488653
8c6d0134a8