proper links and templates array improved