Further work on GUI code.