Split post address and post box to two tields, update form labels