Add SQUID Controller GUI merge