Added menu items, minor graph changes