fixed menu and other stuff