Rebuild the layout and add plugin