Add active link
Fix templates and links