Revert "Unstable UI"

This reverts commit c26e29ef04d9f4000f75ef8fcc4f18d21b607d97.