Revert "WIP UI Update 2"

This reverts commit 264a368bfa99ea29b38b9f9f39ebd328b9e47417.