correctly position edit link

Change-Id: I783588a23a9a28f199df26698b1463e2ec7d8e14
Merge "correctly position edit link"