Revert "Bunch of UI Changes"

This reverts commit c232dae2f74c7b2dd37838ffb6debef277f0c086.