Favicon fix

Added link tag for the favicon and rearranged attributes in other
headers to be consistent.