Refactoring layer names for clarity

It was getting unclear to me which layer was for what ourpose. So I've
reorderd them and re-labeled them to help. I also cleanede up some of
the styles for the country boundaries so there is less repetition.