Added back buttons
Merge branch 'back_button'