List items are now their own thing and editable.
Merge branch 'develop'