Refactored jade templates to components