map widget working needs tidying