Updated to include plans with unspecified group into Other grouping, min-height to modal view