Pull Request: Fix_C4_Nadine_183_edit_answers_4.7

#183 please review @rami-khalil @mohamedsaeed93 @Sharaf93 @mimikian @fadel1493