Clean up and add more UI elements (legend, layer selector)