Revert "Initial UI changes"

This reverts commit d62574bfbf7fd28e4ffc8bdd7c35b1fe05a5bb85.