LAyout changes
Merge pull request #24 from CNagra/layout

LAyout changes