layout and formatting changes