Linked Page View to completed chapter viewing. Minor refactoring and
clean-up, resolved some warnings.