Design and formatting changes