more layouts and config changes