bit more consistent.
Also modified existing menustuff slightly (on some points I made some things more consistent).