GUI classes revamp part 2