Minor menu element edits

Nothing major
Merge branch 'master' of https://github.com/Nagnorg/Programvareutvikling