Added button to hot-spot mapping. Code cleanup.