Revert "Bugfix and tweaks"

This reverts commit df53d46ae993ecaa6cf98550a86c2d2485e9b345.
Example of switching maps within one view.
Revert "Revert "Bugfix and tweaks""

This reverts commit 40d08a7119f16c532e99e049b8fd059540415f9c.