fixed decklist and deck controller