Added 360 stuff
Fixed category columns