Moved map elements to map page