Revert "Revert "UI Improved""

This reverts commit 75639029b1a5763ba299414d573f45861fe48b57.