updates to ui and core