Multiple UI fixes to close issues from in #92 and #94