Fix data, almost done 'view'