Eliminated back button going back problem