Bug fix: remove button