More updates for Send/Receive menu and related

Change-Id: I23adb71689199f6395ebf63c52e664835e735cc6