Fixing Buttons and redirect issues: refs  #657