Layouts improvement