Added menu and minor additions