Tweaks to edit icons, and make Twitter show seach tags as label rather than just Twitter
Remove some excess console.log and tidy up some close calls