Make gui work with new classes