Pull Request: C2_Rania_317_ui_3.13

Issue #317
@ahmedhagii @metawaa @Mamdou7 @AhmedOsam @AhmedElassuty