Tidy up country page layout