Fixed styles
Changed template positions