Improve shape plot