Adjusting header, fixing some links