changed handleClick to handleLink, minor other changes