Take out extraneous div and rename template var