Fix issues regarding views/Override Core template files