Settings screen formatting changes, etc