fix some positioning bugs