working in @vego UI adaptation