Reorganize layout