Work on OSSE, fix UI