uikit updated + cleanup