minor refactoring
minor refactoring 2
Further content tweaks
Couple of front end changes