Template cleanup

Here's a nice template cleanup pull request for you. Essentially: both the main country listing and country individual pages.