Made Membership and Account Navigation work