Fixed some design issues.