Continue API tidy up, fix tab dragging issue