fixed some design issues