feeds template fixed, and other template fixes.
merge conflicts