Improved the user flow of the activities through back button control