Improvement of layout