Upright cable management

!479 (merged) cleans up the z-cable tidy area for the upright but it still doesn't have good cable management. This may improve with #375.