remove unused layouts; add countries