Add photo scrubber toolbar option.

Fix missing method invocation.

Better thumbnail fetch.

Revert some changes.