add styles
merge master