Layout validation fixes