changed layout and formatting