fixed some design bug