Some menu improvements