Add support for OWF functions and rework widget borders