Added box labels, fixed tab order