Some refactoring into core
Some work on condensator GUI buttons