fixes in includes & default layout