Revert "Revert "Major Ui changes and updates""

This reverts commit 44ce970190ec38fe7bee146d1bbfc90d0b852af6.