[Issue #205] Salma fixed sprint 1 issues

Please review
@nohahesham 
@AmrARaouf