Merge branch 'gui_cleanup' into 'develop'

Tidying up some GUI elements

Closes #150

See merge request !144
2 jobs for develop in 28 minutes and 32 seconds (queued for 1 minute and 14 seconds)
Status Job ID Name Coverage
  Build
passed #96143
Linux
debT_clang

00:14:36

passed #96144
Linux
debT_gcc

00:13:55