Simplify types
Combined all types of links and actions into affordances
Merge branch 'master' of https://github.com/smizell/verbose