added links to the callouts. Need to fix bug with tabs not switching to active
Merge branch 'iss20'