Added tags for backstack tracking as well as fixing back button functionality