Update to improve legend placement, axes sizing and counts