CSS: clean up layout
Add config for Grid and OnDemandGrid