Colspan change

Changed colspan from fixed 5 to includeProperties.length + 3