[Default skin] Next step in harmonising menu's and code clean-up. Not ready yet, but we're getting there!