updated config and layout
updated layout