Fixed some design issues