Revert "Improvements to the UI"

This reverts commit 3721e469637b5335680ed8a0bd91b2aae70871dd.