Added OCL module app and changed to new UI framework