[New Feature][Issue-17] Fixing Screenshots