Work on OSSE, fix UI
Merge pull request #314 from emmanuel-keller/master

Work on OSSE, fix UI