Fixed choosers in wizard and added Alignment.