Added some finishing touches on the template