Ui fixes for #1158, #1182 and #1210