changes done by dev20 for layout
Merge pull request #123 from raviosc/developer20

changes done by dev20 for layout