Even more work on CustomerGUI