Remove unnecessary options, add cookie to rpc, add two buttons to notification.