set position
Merge branch 'dev' into ui