Remove usage of templates for key views
Update Ornament