Worldmap view improvements

Made some more tests and improved worldmap view