reorganized layout