Work on territory layout. closes #83