Unify upload lists

- Unify image- and filelists into one
- Make image- and filelists looking more flat