Revert UI Improvements Pull Request