countries refactor
refactor views