Encapsulated data for map and transcript views, improved transcript time...

...code logic