Finished linked shapes bug fixing