UI fixes

Resolves #1219 and #1215