GUI classes revamp part 3