Neymar has made real progress in the last two years but Lionel Messi is still Barcelona's undisputed star, according to Rivaldo