Layouts redesigned