Fix bug and rename button