UI adaptions for delete on server
Merge remote-tracking branch 'origin/master' into VersionRemoval