Finish screenshot module
Few tweaks