fixed saving armor issue; refactored armor view models to be more elegant