Corp map enhancements

https://www.pivotaltracker.com/story/show/80854202
https://www.pivotaltracker.com/story/show/80749948