seamless integration layout change
Merged issue-7 into develop and resolved conflicts