modified Layout and Widget