Changed layout and formatting