Bring cap style combo box back (got lost somehow while merging the branch)