Changes and tweaks to submitted viewWillDisappear