List view now auto-loads properly
Merge remote-tracking branch 'origin/master'