add ons page
Merge branch 'issue-198' into develop