Crafting Annex Fixes

Indentation fixes as well.

There is probably some cleanup that can be accomplished, but I'm not really sure how to improve checking to see which item we have selected in a single statement.