Changes to fix manual axis control for AP2DataPlot, and tidying up the UI