Fix drawing problem on FF/Opera, Get rid of duplicate tracker