Fixing title presentation and links