Slight UI reorganization for the plotting tool