Fixed bug with data structure + New profile cells