UP-4360 : Fix saving of your layout to be one ajax call