Consolidated both buttons into one