more work on CRM-12357
whitespace fixes
worked on CRM-12357, fixed redirecting back to correct page
Merge pull request #608 from kurund/CRM-12357

CRM-12357