internal linking and view improvements