Revert "UI changes"

This reverts commit 557465d91f76934b2429069e0d5081a5e102bce9.
Fixed some issues