Fix up column order
Fix inventory bug