collation view refacto
Merge branch 'master2' of https://github.com/exaprint/cms-ui into master2