Minor Menu Fixes