made changes to layout
merging