Back porting changes to the layout