Fixed linking and titles