Back button now works as it should