Fixed unit views not being correctly picked based on age + gender, simplified a bunch of related code Lots of UI refactoring More persistence refactoring, with better saving