Modified Data Admin and LogoutMenu