Merge UI with Neo-Logic