Misc ui fixes incl. #1094 and #1112