Ui fixes: #1162, #1113, #1118, #1160, #1103