updated legends
added movement border
merge
conflict resolved, tooltip