Fixed weapons layout, removed unused imports, capitalized constants