Added sizing based on number of fields