Changes made for layout and text