Updated config file and default layout

Updated config file and default layout