css changes
Merge branch 'capEdit'