fixed some design