Fixed overlayed category item number. Some cleanups