Revert "more and more small ui fixes"

This reverts commit 4440f5532b5e2cfbd17fe2589b40fe71c73f7bb0.