Continued new layout