- added overlays handling

- changed thumbnails handling