Implement track style changes from #136

See #205 for images. The previous track style was a mess, but a review of code style would be a good idea.