Revert "Revert "Did some editing to the Track State to make nice""

This reverts commit 37e2ffb4c48fbd13740c1dd3ce85f1eb2744dc5a.