master: Updating editing template so that the style doesn't look weird