initial work to make activity view performant