better thumbnail control

Change-Id: I0abee4552a90e9b18bc0900c08142e3d9aaa8bed