A few UI changes
Revert "A few UI changes"

This reverts commit e8195ebd594a6e9a652282bf2ef9f3a917b398fb.