Layout update and fix some feed links