Revert "Revert "Ändringar som gäller menyn""

This reverts commit c58ff2c587b9111be12652408ff3d76e700fd46d.