fix views and added country to class