UrlResolver is now using in all links in templates
Plus some minor styling fixes