modify style
Merge branch 'activty_style' into develop