Support inline scrubber with test file, some white space fixes.
fixed thumbnail going off the screen on the right side
fix conflict with fec-572