Fix some links
Better page titles