ginar/#665 fixing mobile

Ghina Rashwanirequested to merge
ginar/#665_fixing_mobile into develop

Merge request reports