Isolated button issue; needs to be fixed properly