Commit for deck_type and dropdown fix