Added Screenshot and improved wizard