s6 - Updated GUI to match the Plots support