Added distance to base handler
resolved conflicts
Fixed signup page so it shows map