Fix API, swap axes on charts