Reorganize and add layout