Greasemonkey 2.0 changes, and fix for new TM layout