Update the formatting for a more presentational layout.
Merge remote-tracking branch 'origin/HOTFIX' into develop