Add message for expired memberships
Fix several bugs in membership management