Clean up shortcut creation

1) When no subject is given, use the url for the shortcut name.
2) Fix clean up logic in dialog.  Make sure it works when the back button is pressed.