Merge branch '8701_improve_gui_design' into 'master'
8701 improve gui design
See merge request aswi/aswi-2021/aswi2021jmsd!33
Merge branch '8701_improve_gui_design' into 'master'
8701 improve gui design
See merge request aswi/aswi-2021/aswi2021jmsd!33