Merged views into common/directives directory