I love the ability to make things optional in the template! But when I add them, they do not get put into the template in the order they are saved to the template, they get put at the bottom of the list. We all organize our templates in a specific order. But if I want to add an additional furnace, or an optional office, these get put at the bottom of the categories. It would be great if they defaulted to the position they are saved too in the template, so we do not have to reorder the categories.