added fixes for onomy UI