bug fixes
Merge pull request #304 from nys-its/master

Sync pages with master