Fixed List Functions

- Error was causing application from launching. Hopefully this fixed it.
Merge remote-tracking branch 'origin/master' into design