Fixed Menu and Fixed database