Isolated menu in base layout
Håndtert merge conflict