small changes in layout
merge conflicts