Add ccs for view
Merge branch 'esbb48' into wip