Fixes #26 (Area will need refractoring)
Fixes #18 and resolves #25 among other minor changes
Handeling deselection when adding/removing a delivery