Tweaking the templates and style