Change layout and added country attribute to table