Some refactor; added alerts list and map; WORK IN PROGRESS for details