Updates on Layout and Cell