adding structure plus map bubbles