reordered handelers, minor html change