Work on the GUI rewrite. Controller & NI done.