Ui fixes for #1357 and #1360