Refactored views and server to use eager loading, adjusted weapons table structure