Possible button duplication now eliminated