restructered widget views for mapping capabilities