change some structure and add screenshots