Made some changes to the Controller, and some minor tweaks to the
Graphical Window.