#233 Fix menu generation