Reverted to old border options.
Fixed most of the borders not properly drawn.
Added highlighting of districts/organisation units when clicking or selecting.
Merged the whole shebang.