Revert hiding menus without permissions.
 Also some changes from stupid git ...