Changes for layout