Revert "New UI"

This reverts commit a00d74a6f79a2377e01bead0de93d1d72ce654da.
Revert "Revert "New UI""

This reverts commit 2c6f438317d2cd3c6ab53c6b644991457aa8b951.