Enhanced Tracking and Minor UI changes

[#82305034 #83678224]

Filled out Admin models as well.