cleaned up things and fixed in page edit bugs
Merge branch 'sherpa-v0.8-jerry-wip' into sherpa-v0.8-bo-wip