Fixed layout issues, see stretching