Add screenshot and some refactoring.