Revert "Revert "swap x,y label""

This reverts commit 09eea1401e1de540d379ba1e37eb94c918508c15.