Added and tidied templates