styles and changes in layout
conflict resolved