[Default skin] One more step in harmonising menu's and code clean-up. Still not done....