Improved formatting
Countries using now dynamic loading also.