fixed missing shortcuts on startup
adjusted link urls and terms of use
Merge branch 'ribbons' into public