Revert "UI changes2"

This reverts commit bc2e21a9ff99c04b2a2bc7280c6faada2d054884.