Fixed #2 and #3: alphabetized decks, inline fields