Merge branch 'ui-clean' into 'master'

Fix #29 #30

Closes #30 and #29

See merge request !34
8 jobs for master in 13 minutes and 19 seconds (queued for 11 seconds)