More layout improvement