1. Add drawing layer
2. Fix export multiple geometry sources to shape file
3. Small fixes