Improve menu generation