Fix rights button display
Fix broken HTML
Merge branch 'develop' into fork/format-id-guide