Integrated Laura's changes into the menus.

Signed-off-by: Christian Gunderman <christian@sonofboss.cwru.edu>