Merge "Refactor the common-view and csit-view template"