removed useless code from new screens. Fixed issue with editing patients.