added two new items, changes some formatting