Changed around menu for device tools