Improved view in edit templates