[master] fixed design issues.