Made layout avoid more short pages