Fixed Logic in menu