Merged Layout generator into app generator