Clean up some positioning