Fixing back button issue
Changed click handler
Merge branch '2014.21-Bugfixes'