Refactor: ListView and FileView updates