Added favicon & expand logic