Merge branch 'develop'
Use url helpers in the sidebar.

Generally good practice.
Merge branch 'sidebar-url-helpers' into develop