refactored naming conventions in maps widget
refactored naming conventions in crimes widget