Fixed armor rendering code + made the armor a bit simpler to implement