small progress on UI Logic