Add screenshot and small fixes