Yes, at this time there is a limit and it varies based on the type of fields you add. If you run into any issues adding fields that aren't showing up in the builder, please contact us and we'll increase your limit.