Static layout for deckbuilder + minor enhancements