Improvement: layout