Fix aside width style
Merge branch 'dev'