Added BackButton handling