Updated config & layouts

Updated config & layouts