Updated default layout & config

Updated default layout & config