Updated to uiframework 3.1