Fixing bugs - uikit framework issues - to switch to foundation