Improved UI, Links in template files