onBackPressed improved
onBackPressed improved + Merge