Added menu entries and functionality