Merge branch 'v2-ui' into 'dev-v2'

V2 ui

See merge request !25
1 job for dev-v2 in 2 minutes and 14 seconds