menu improvements. mark as beta version