Add the gesture box draw, improve gesture detection