added link to tripadvisor
fixed icon
Handle alerts better
Merge branch 'master' into gh-pages