Added mappings list on popup. Some refactor on messages done
Merging