finally fixed menu