Change Layout and add ng function