Better layout, especially for shorter screens...