Further improvement of the lay-out.