More UI updates
Revert "More UI updates"

This reverts commit 4bb40921b3ec6ffeeabd337942534dfb3ebd043d.
More UI updates