Fixing UI again
Revert "Fixing UI again"

This reverts commit 63e2a0bd01ad3174fcb9ea770eb4e3bc78566e11.