correctly integrate the new back button
Merge pull request #75 from IanMayo/hotfix/ian/back_btn

correctly integrate the new back button