bug fixes
added staggered grid timeline
improved image preview
Merge remote-tracking branch 'upstream/dev' into dev