Mweb 1043

@nandy-andy @RafLeszczynski @rogatty 
I didn't really change methods for rearranging poi markers, they are just moved. If you think refactoring logic for them should be a part of this story, i'll do it.