Aesthetic fixes
Played around with options for when length < 2
Aesthetic changes
Merge branch 'gh-pages'