Button refactoring: do not pass attrs and id to buttons inside checkbox and radio-button