Better warning logic, layouts order.