Done fixing Cancel buttons