Fixed the various back buttons
Merge branch 'back'