Merge branch 'cleanup_ui' into 'django3_migration'

Cleanup ui

See merge request !368
1 job for django3_migration in 15 minutes and 9 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #208706
docker-build
build_linux_36

00:15:09

65.0%