Changes to Support Portal Layout