Cleanup, and working on controller GUI