Added the label but pending the button
Added the button. This finishes with iss60
Fixed the conflict