fix
adjust ui & futures
Merge branch 'adjustui' into dev