Added check for attach-volume, added better locators for clicks.