layout cleanup
Merge branch 'item-css'