Fixed UTF-8 issue using layouts and added default layout