Updated Menu System and Menu Generator to support Chunks

Change-Id: I3c281fe54497a05822c1d96529e5c3c3495c0d2f