Initial uikit modifications