Merge branch 'fix/webui' into 'develop'

Fixing issues with the WebUI and the optical cybersecurity module

Closes #57 and #102

See merge request !210