added favicon, fixed push state json conflict