make sure to hide the underlying stuff too
close the toolbar when you press escape
some mild name improvement