Made Link View work based on the current implementation