General clean up and addition of favicon