[NO_JIRA] marketplace UI updates.  Fix bug where back button URL was not being set before it was being used.