Merge pull request #192 from COPPER-BOBCAT/staging

Staging
improved finished page look
Merge pull request #194 from zindlerb/master

fixed ending page