some refactoring: throw map icon click handler into separate function
rm un-semantic div