Change list formatting and fix a broken list