Default template improvements