Add button reset and others modifications