bug fixes in menu