moving non-whitelist content back to its own file, and adding user menu