Changed colspan

 Changed colspan from fixed 5 to includeProperties + 3