Updated client code to start using UI2, leaving old gui for now as a reference