ui layer velocity and movement refactor complete