Reworking menu in other files
Merging in origin/master
Merge branch 'master' of github.com:Melindrea/mariehogebrandt-se