add ShowAsThumb and some fixes