few fixes in menu