Changes to make title fit in option container if it exists