fixed some Issues to make sure didDisappears and willDisappear get called