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