improve styles
merge