Ui fixes: issues #1249, #1232, #1158, #1250