Move EditField Builders to Alterate Constructor