Gh115 link edit res

Issues #114, #115