Es cr refactoring current project view

Merge after bg-color_spike branch.