Tidied up the default template