Update config and layout