config, layout fixes