More data mgmt, added a menu