Improved new layout.