Some enhancements to Add Trackings page