Made styles look like original; fixed form edit button behaviour; simplified template a bit