Fixed layout and navigation. Added required weapon resources