Edit css + limit datasource grabbing
Merge branch 'master' into staging