create a proper country view and clean up some of the code