Fixed more design issues.