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