Added measurement and picking tools