Add back button in options
Fix conflicts