add disclose and back button handling