fixed menu and database