Added menu generation