Feature/cfy 532 separate ui from core