fixes and changes

- fix issue introduced previous commit, redirect was to early - after
first image uploaded
- changed upload category select to a simple select field (makes things
simpler)
- some cleanup