Revert "Multiple UI functionality additions"

This reverts commit 850aec7457e994554496d9f0facf61710ce15a0a.