Refactor repository architecture to make it work in a the same activity
Restore the repository back stack when activity is recreated