Revert "Bring back non intrusive UI"

This reverts commit 456cf0f1c40db61db7c4f16a5877c7c3d3e499a4.