Make use of vector addition
Clean up GUI