Cleaning up and adding favicon