Rough: Added Options Menu & Fixed Error where payload was getting deleted