ui and formatting changes