Revert "UI Improvements"