fix layout sizing issues
 fix layout sizing issues
Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into Design_Assuty
 fix convention
Merge pull request #368 from alaashafaee/Design_Assuty

Pull Request: Design_Assuty_layout_fix