hs: new menu structure; improved spec markers