Refactored to facelets