Feature/now 574

nm looked at it early, you added the admin-menu and didn't remove it