Mayor GUI improvements
Tracker System Done
Merge remote-tracking branch 'origin/master'