More menu stuff and changed flags slightly