revised layout done
Merge branch 'issue-12' into develop