Layout and merge updated