Revert "ui fixes"

This reverts commit c0eea5ac39bf1ae3d72fa096d41e8ededfe262b0.
and redo