Some progress, but more layout improvement needed.