clean disused styles
Merge branch 'layout'