a lot of changes to move map on other page :)