Improve design even more.