UI work for edit country and language section (bug 866287)