Improved GUI classes and credentials passing