Custom List items, fixed some bugs