Resolved update with new cliplayout
and with keeping current layout