moving debug mixin out of core views
restructured country dict