model layout improvement