Fixing up template