Fixed broken code and new list item UI