Revert "Revert "ui changes""

This reverts commit 25481e3d63c3202da9e8a9f80d5cd5fa2e545cf6.