Leo updates

RKrequested to merge
develop-12-02-tmxs into develop

Fixing Leo representation in various places on the site

Merge request reports