More toolbar work.
Fixed issues with cancel button.