fix design review bugs