Small changes to database and main menu