Improves and fixes offer creation/rejection flow