Added sample portlet, and some adjustments so that the generated pages look right