A few formatting changes to get the lists to work right