layout bug fix
Merge pull request #275 from amit-git/2.x

layout bug fix