added funcitonality for employee detail form
Corrected merge errors.