Updated config & default layout

Updated config & default layout