Added check for trap number
Moved DatePicker to support