Categories in it's own table

Plus a bunch of little fixes to items