Enhanced the moving funcitonality and look