Template, Views and Skill Functionality Changes