Moved keyboard notification to viewWillAppear because it was being removed in viewWillDisappear