Fixing Template Structure