Adding updated and fixed files issue #211

Issue #211 

Fixed previous issues and removed Nadine's part
Please review:
@Rania-Abdel-Fattah @Ahmed-Moataz @Ahmed-Atef @ahmed93 @ranaelnagar