More improvements, updated screenshot