changes done to layout
Merge branch 'issue-1'