Reorganized layout