Fixed image bug, did a bit more work on weapon display