Small category cleanup
Categories JS fix