Changes for layout improvements