Minor Menu System Changes