Fixed and refactored links and templates