refactor to use divvy service locator
added fullscreen control to map