feed links added, some improvment on template