multistep senario mostly in place
Merge branch 'sprint2-fixes' of github.com:nesi/nesi-webportal into sprint2-fixes