Merge branch 'release/1.0.0'
Display different forms as code

Just don't like the uneven lines
Merge branch 'hotfix/1.0.1' into develop