Added visual tagging, improved responsiveness..