SFM: Fixed track generation, style fixes, incremental bundler component