Updated to dojo style + (temporary) removed track elements