menu
some fixes