Revert "UI updates"

This reverts commit 243fdfb62b5df41b68bd16532c1c66cbe98bec00.