Refactored to property injection and change path to default layout
Refactored
Refactored for last version on Kappa