using horizon field template for the fields
more adjust
fix merge