Merge branch '95-fix-some-aesthetic-issues' into 'main'

Resolve "Fix some aesthetic issues"

Closes #95

See merge request !117