style links
Merge branch 'dev'