Fixed validation and Added ScreenShots