Integrated Balance tu gui & bugfixes to related classes