Addressing back btn issue