enhanced object oriented refactoring, added styled demo pages