small menu and semantic changes