More work on CustomerGUI