layout related changes
laout related
Merge pull request #153 from raviosc/developer107

Developer107