Remove cancel button and fix focussing bug.
Merge pull request #1803 from opf/fix/user-comment-remove-cancel-button

Remove cancel button and fix focussing bug.