updated uikit + structure