Fixed pushing and popping of activties using back button