Revert "HD UI Changes step 1"

This reverts commit ec3227a98ca859088fa6ce981f1f9915986f7ac0.