Revert "UI update"

This reverts commit 8bd64fddac5ea9f500593514c6588742d6d91084.
Revert "Revert "UI update""

This reverts commit 300c33f67550bf4fec4b3ad1d396b0561bb2d280.