Adding pump control and updating the UI to be easier to use