Changes to GUI closes #16 closes #3