fixing last issues with menu