updated to accomidate narrow windows
Merge branch 'develop' into gh-pages