Pull Request: Fix_CX_Khaled_193_View_Variables_3.7

Issue #449 
Reviewers: @MussabElDash @mohamedsaeed93 @ahmedhagii @Ahmed-Moataz