Fix category display/ Change Wallet UUID to ID