Improvements for basic templates (viewer, composer)