Stopping Point - Area Management UI updates

Still need to fix some data after db changes
Merge remote-tracking branch 'origin/master'