updated config and layout