points of interest saveable again
Big Map Layouted
Merge branch 'master'
merge commit
not fully merged (style on some things unclear) + seperate code