style and layout changes

style and layout changes