fix a few design