Back button now working across groups