Minor cleaning in MapViewer
Minor cleaning in MapViewer
Major restructering of MapViewer