Added predecon to ui
Fixed merge conflicts