[~] some fixes in menu