separated UI from core
merge with actual