minor fixes on all pages
Merge branch 'issue-59' into develop