some layout and result pg changes but mostly just pulling down new code
Merge branch 'master' into sarabranch
adding gena's input page view
Merge branch 'master' into sarabranch
Merge pull request #17 from kneekey23/sarabranch

Sarabranch