Fixed bug with double menu items