Revert "Revert "UI changes""

This reverts commit ab5d335c6df7f6eadd4f75667c2c4a68eca1ee9f.