Fixed expando styles
Merge branch 'dev'