Added favicon.ico from current site to template
Tidied up code removing unnecessary parts