Improved demo

Made demo a bit more meaningful by renaming features and using them in a JSF page.