Mucking around with the edit template, still not totally happy with it.