Changes to linking and stuff
Link fixes for view and edit