Fix one layout issue. Another remains.