Minor ui fixes: issues #1220, #1036, #1221